This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Move more code into state-account #10840
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove botched ethcore-error crate
* master: Extricate PodAccount and state Account to own crates (#10838) logs (#10817) refactor: whisper: Add type aliases and update rustdocs in message.rs (#10812) Break circular dependency between Client and Engine (part 1) (#10833) tests: Relates to #10655: Test instructions for Readme (#10835) refactor: Related #9459 - evmbin: replace untyped json! macro with fully typed serde serialization using Rust structs (#10657)
…hore/extricate-state-backend * dp/chore/extricate-account-db-into-own-crate: third time's the charm test failure 2 test failure Extricate PodAccount and state Account to own crates (#10838) logs (#10817) refactor: whisper: Add type aliases and update rustdocs in message.rs (#10812) Break circular dependency between Client and Engine (part 1) (#10833) tests: Relates to #10655: Test instructions for Readme (#10835) refactor: Related #9459 - evmbin: replace untyped json! macro with fully typed serde serialization using Rust structs (#10657)
* master: Improve logging and cleanup in miner around block sealing (#10745)
debris
reviewed
Jul 7, 2019
* master: EIP-1702: Generalized Account Versioning Scheme (#10771)
tomusdrw
approved these changes
Jul 8, 2019
| ethcore-blockchain = { path = "../blockchain" } | ||
| ethcore-db = { path = "../db" } | ||
| ethereum-types = "0.6" | ||
| evm = { path = "../evm" } |
There was a problem hiding this comment.
Again requiring entire EVM seems odd, would be worth to remove it in the future.
There was a problem hiding this comment.
We use CallType from the evm, that's all. Seems like a good opportunity for a refactor indeed.
|
|
||
| [dependencies] | ||
| common-types = { path = "../types"} | ||
| ethcore-blockchain = { path = "../blockchain" } |
There was a problem hiding this comment.
Do we really need the entire blockchain or just some trait definitions?
There was a problem hiding this comment.
Currently we use BlockChainDB and the contentious DatabaseExtras, e.g.:
pub struct TraceDB<T> where T: DatabaseExtras {
/// cache
traces: RwLock<HashMap<H256, FlatBlockTraces>>,
/// hashes of cached traces
cache_manager: RwLock<CacheManager<H256>>,
/// db
db: Arc<dyn BlockChainDB>,
/// tracing enabled
enabled: bool,
/// extras
extras: Arc<T>,
}
There was a problem hiding this comment.
What is your thinking here? Are you thinking we should move traits to a common-traits crate?
debris
approved these changes
Jul 8, 2019
| @@ -100,7 +108,7 @@ impl<'a> EvmTestClient<'a> { | |||
| } | |||
|
|
|||
| /// Change default function for dump state (default does not dump) | |||
| pub fn set_dump_state_fn(&mut self, dump_state: fn(&state::State<state_db::StateDB>) -> Option<pod_state::PodState>) { | |||
| pub fn set_dump_state(&mut self) { | |||
| self.dump_state = dump_state; | |||
There was a problem hiding this comment.
this function looks a bit weird
|
@tomusdrw @debris Merging this but I'll make sure the following gets addressed in follow up PRs:
|
ordian
added a commit
that referenced
this pull request
Jul 9, 2019
* master: Run cargo fix on a few of the worst offenders (#10854) removed redundant fork choice abstraction (#10849) Extract state-db from ethcore (#10858) Fix fork choice (#10837) Move more code into state-account (#10840) Remove compiler warning (#10865) [ethash] use static_assertions crate (#10860)
dvdplm
added a commit
that referenced
this pull request
Jul 9, 2019
* master: Run cargo fix on a few of the worst offenders (#10854) removed redundant fork choice abstraction (#10849) Extract state-db from ethcore (#10858) Fix fork choice (#10837) Move more code into state-account (#10840) Remove compiler warning (#10865) [ethash] use static_assertions crate (#10860)
This was referenced Nov 5, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moves
ethcore/stateinto a newaccount-statecrate.State management has a piece that is tightly coupled to other
ethcoremodules, mainlyMachineandExcutive(and related types and support code).In order to extract the state management code from
ethcoreI have left one module –executive_state– inethcorethat isolates the code where the state code is too entangled with the rest ofethcoreto be tackled at this time. The tests for state management are also still inethcorebecause of the tight coupling with otherethcoremodules. While this is rather ungainly and unsatisfactory I think it's an improvement to have this code in an isolated unit that makes it obvious where the coupling takes place.The end result is that we now have 6k loc less in
ethcoreand the following new crates:tracefactoriesaccount-statepodaccount-dbfrom Extract AccountDB to account-db #10839We also have a somewhat smaller API surface on
ethcore.The diff is very noisy and for that I apologise. The only really new code is in
executive_state.rsand the rest is mostly cleanup and munging. None of theTODOs that show up as "green" are mine (but still worthy of consideration ofc). I have used this branch to sync Goerli.Builds on #10839